x11: Unify focus handling code

This code was essentially copy-pasted in two locations, so unify them in
the same place.

https://bugzilla.gnome.org/show_bug.cgi?id=657578

diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c
index 1fcb67ddd4cd696b3529e3ada1e1ffff1f1085cf..156ba8bfd8c163c12546a475f7822dd8667e2161 100644 (file)
--- a/gdk/x11/gdkdevicemanager-core-x11.c
+++ b/gdk/x11/gdkdevicemanager-core-x11.c
@@ -225,23 +225,6 @@ set_user_time (GdkWindow *window,
                                   gdk_event_get_time (event));
 }
 
-static void
-generate_focus_event (GdkX11DeviceManagerCore *device_manager,
-                      GdkWindow               *window,
-                      gboolean                 in)
-{
-  GdkEvent *event;
-
-  event = gdk_event_new (GDK_FOCUS_CHANGE);
-  event->focus_change.window = g_object_ref (window);
-  event->focus_change.send_event = FALSE;
-  event->focus_change.in = in;
-  gdk_event_set_device (event, device_manager->core_keyboard);
-
-  gdk_event_put (event);
-  gdk_event_free (event);
-}
-
 static gboolean
 set_screen_from_root (GdkDisplay *display,
                       GdkEvent   *event,
@@ -358,7 +341,6 @@ gdk_x11_device_manager_core_translate_event (GdkEventTranslator *translator,
   GdkX11DeviceManagerCore *device_manager;
   GdkWindow *window;
   gboolean return_val;
-  GdkToplevelX11 *toplevel = NULL;
   GdkX11Display *display_x11 = GDK_X11_DISPLAY (display);
 
   device_manager = GDK_X11_DEVICE_MANAGER_CORE (translator);
@@ -371,7 +353,6 @@ gdk_x11_device_manager_core_translate_event (GdkEventTranslator *translator,
       if (GDK_WINDOW_DESTROYED (window) || !GDK_IS_WINDOW (window))
         return FALSE;
 
-      toplevel = _gdk_x11_window_get_toplevel (window);
       g_object_ref (window);
     }
 
@@ -681,120 +662,16 @@ gdk_x11_device_manager_core_translate_event (GdkEventTranslator *translator,
 
       break;
 
-      /* We only care about focus events that indicate that _this_
-       * window (not a ancestor or child) got or lost the focus
-       */
     case FocusIn:
-      GDK_NOTE (EVENTS,
-                g_message ("focus in:\t\twindow: %ld, detail: %s, mode: %s",
-                           xevent->xfocus.window,
-                           notify_details[xevent->xfocus.detail],
-                           notify_modes[xevent->xfocus.mode]));
-
-      if (toplevel)
-        {
-          gboolean had_focus = HAS_FOCUS (toplevel);
-
-          switch (xevent->xfocus.detail)
-            {
-            case NotifyAncestor:
-            case NotifyVirtual:
-              /* When the focus moves from an ancestor of the window to
-               * the window or a descendent of the window, *and* the
-               * pointer is inside the window, then we were previously
-               * receiving keystroke events in the has_pointer_focus
-               * case and are now receiving them in the
-               * has_focus_window case.
-               */
-              if (toplevel->has_pointer &&
-                  xevent->xfocus.mode != NotifyGrab &&
-                  xevent->xfocus.mode != NotifyUngrab)
-                toplevel->has_pointer_focus = FALSE;
-
-              /* fall through */
-            case NotifyNonlinear:
-            case NotifyNonlinearVirtual:
-              if (xevent->xfocus.mode != NotifyGrab &&
-                  xevent->xfocus.mode != NotifyUngrab)
-                toplevel->has_focus_window = TRUE;
-              /* We pretend that the focus moves to the grab
-               * window, so we pay attention to NotifyGrab
-               * NotifyUngrab, and ignore NotifyWhileGrabbed
-               */
-              if (xevent->xfocus.mode != NotifyWhileGrabbed)
-                toplevel->has_focus = TRUE;
-              break;
-            case NotifyPointer:
-              /* The X server sends NotifyPointer/NotifyGrab,
-               * but the pointer focus is ignored while a
-               * grab is in effect
-               */
-              if (xevent->xfocus.mode != NotifyGrab &&
-                  xevent->xfocus.mode != NotifyUngrab)
-                toplevel->has_pointer_focus = TRUE;
-              break;
-            case NotifyInferior:
-            case NotifyPointerRoot:
-            case NotifyDetailNone:
-              break;
-            }
-
-          if (HAS_FOCUS (toplevel) != had_focus)
-            generate_focus_event (device_manager, window, TRUE);
-        }
-      break;
     case FocusOut:
-      GDK_NOTE (EVENTS,
-                g_message ("focus out:\t\twindow: %ld, detail: %s, mode: %s",
-                           xevent->xfocus.window,
-                           notify_details[xevent->xfocus.detail],
-                           notify_modes[xevent->xfocus.mode]));
-
-      if (toplevel)
-        {
-          gboolean had_focus = HAS_FOCUS (toplevel);
-
-          switch (xevent->xfocus.detail)
-            {
-            case NotifyAncestor:
-            case NotifyVirtual:
-              /* When the focus moves from the window or a descendent
-               * of the window to an ancestor of the window, *and* the
-               * pointer is inside the window, then we were previously
-               * receiving keystroke events in the has_focus_window
-               * case and are now receiving them in the
-               * has_pointer_focus case.
-               */
-              if (toplevel->has_pointer &&
-                  xevent->xfocus.mode != NotifyGrab &&
-                  xevent->xfocus.mode != NotifyUngrab)
-                toplevel->has_pointer_focus = TRUE;
-
-              /* fall through */
-            case NotifyNonlinear:
-            case NotifyNonlinearVirtual:
-              if (xevent->xfocus.mode != NotifyGrab &&
-                  xevent->xfocus.mode != NotifyUngrab)
-                toplevel->has_focus_window = FALSE;
-              if (xevent->xfocus.mode != NotifyWhileGrabbed)
-                toplevel->has_focus = FALSE;
-              break;
-            case NotifyPointer:
-              if (xevent->xfocus.mode != NotifyGrab &&
-                  xevent->xfocus.mode != NotifyUngrab)
-                toplevel->has_pointer_focus = FALSE;
-            break;
-            case NotifyInferior:
-            case NotifyPointerRoot:
-            case NotifyDetailNone:
-              break;
-            }
-
-          if (HAS_FOCUS (toplevel) != had_focus)
-            generate_focus_event (device_manager, window, FALSE);
-        }
+      _gdk_device_manager_core_handle_focus (window,
+                                             device_manager->core_keyboard,
+                                             NULL,
+                                             xevent->type == FocusIn,
+                                             xevent->xfocus.detail,
+                                             xevent->xfocus.mode);
       break;
-
+                                              
     default:
         return_val = FALSE;
     }
@@ -912,3 +789,97 @@ _gdk_x11_event_translate_keyboard_string (GdkEventKey *event)
       event->string = g_strdup ("");
     }
 }
+
+/* We only care about focus events that indicate that _this_
+ * window (not a ancestor or child) got or lost the focus
+ */
+void
+_gdk_device_manager_core_handle_focus (GdkWindow *window,
+                                       GdkDevice *device,
+                                       GdkDevice *source_device,
+                                       gboolean   focus_in,
+                                       int        detail,
+                                       int        mode)
+{
+  GdkToplevelX11 *toplevel;
+  gboolean had_focus;
+
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  g_return_if_fail (GDK_IS_DEVICE (device));
+  g_return_if_fail (source_device == NULL || GDK_IS_DEVICE (source_device));
+
+  GDK_NOTE (EVENTS,
+            g_message ("focus out:\t\twindow: %ld, detail: %s, mode: %s",
+                       GDK_WINDOW_XID (window),
+                       notify_details[detail],
+                       notify_modes[mode]));
+
+  toplevel = _gdk_x11_window_get_toplevel (window);
+
+  if (!toplevel)
+    return;
+
+  had_focus = HAS_FOCUS (toplevel);
+
+  switch (detail)
+    {
+    case NotifyAncestor:
+    case NotifyVirtual:
+      /* When the focus moves from an ancestor of the window to
+       * the window or a descendent of the window, *and* the
+       * pointer is inside the window, then we were previously
+       * receiving keystroke events in the has_pointer_focus
+       * case and are now receiving them in the
+       * has_focus_window case.
+       */
+      if (toplevel->has_pointer &&
+          mode != NotifyGrab &&
+          mode != NotifyUngrab)
+        toplevel->has_pointer_focus = (focus_in) ? FALSE : TRUE;
+
+      /* fall through */
+    case NotifyNonlinear:
+    case NotifyNonlinearVirtual:
+      if (mode != NotifyGrab &&
+          mode != NotifyUngrab)
+        toplevel->has_focus_window = (focus_in) ? TRUE : FALSE;
+      /* We pretend that the focus moves to the grab
+       * window, so we pay attention to NotifyGrab
+       * NotifyUngrab, and ignore NotifyWhileGrabbed
+       */
+      if (mode != NotifyWhileGrabbed)
+        toplevel->has_focus = (focus_in) ? TRUE : FALSE;
+      break;
+    case NotifyPointer:
+      /* The X server sends NotifyPointer/NotifyGrab,
+       * but the pointer focus is ignored while a
+       * grab is in effect
+       */
+      if (mode != NotifyGrab &&
+          mode != NotifyUngrab)
+        toplevel->has_pointer_focus = (focus_in) ? TRUE : FALSE;
+      break;
+    case NotifyInferior:
+    case NotifyPointerRoot:
+    case NotifyDetailNone:
+    default:
+      break;
+    }
+
+  if (HAS_FOCUS (toplevel) != had_focus)
+    {
+      GdkEvent *event;
+
+      event = gdk_event_new (GDK_FOCUS_CHANGE);
+      event->focus_change.window = g_object_ref (window);
+      event->focus_change.send_event = FALSE;
+      event->focus_change.in = focus_in;
+      gdk_event_set_device (event, device);
+      if (source_device)
+        gdk_event_set_source_device (event, source_device);
+
+      gdk_event_put (event);
+      gdk_event_free (event);
+    }
+}
+

diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index d1481aa6fee00a05d162c783b83de4bb1550c0c3..273ca7dfb920e429caca47c98fe5118662e78a32 100644 (file)
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -739,91 +739,6 @@ set_user_time (GdkEvent *event)
     gdk_x11_window_set_user_time (window, time);
 }
 
-static void
-generate_focus_event (GdkWindow *window,
-                      GdkDevice *device,
-                      GdkDevice *source_device,
-                      gboolean   in)
-{
-  GdkEvent *event;
-
-  event = gdk_event_new (GDK_FOCUS_CHANGE);
-  event->focus_change.window = g_object_ref (window);
-  event->focus_change.send_event = FALSE;
-  event->focus_change.in = in;
-  gdk_event_set_device (event, device);
-  gdk_event_set_source_device (event, source_device);
-
-  gdk_event_put (event);
-  gdk_event_free (event);
-}
-
-static void
-handle_focus_change (GdkWindow *window,
-                     GdkDevice *device,
-                     GdkDevice *source_device,
-                     gint       detail,
-                     gint       mode,
-                     gboolean   in)
-{
-  GdkToplevelX11 *toplevel;
-  gboolean had_focus;
-
-  toplevel = _gdk_x11_window_get_toplevel (window);
-
-  if (!toplevel)
-    return;
-
-  had_focus = HAS_FOCUS (toplevel);
-
-  switch (detail)
-    {
-    case NotifyAncestor:
-    case NotifyVirtual:
-      /* When the focus moves from an ancestor of the window to
-       * the window or a descendent of the window, *and* the
-       * pointer is inside the window, then we were previously
-       * receiving keystroke events in the has_pointer_focus
-       * case and are now receiving them in the
-       * has_focus_window case.
-       */
-      if (toplevel->has_pointer &&
-          mode != NotifyGrab &&
-          mode != NotifyUngrab)
-        toplevel->has_pointer_focus = (in) ? FALSE : TRUE;
-
-      /* fall through */
-    case NotifyNonlinear:
-    case NotifyNonlinearVirtual:
-      if (mode != NotifyGrab &&
-          mode != NotifyUngrab)
-        toplevel->has_focus_window = (in) ? TRUE : FALSE;
-      /* We pretend that the focus moves to the grab
-       * window, so we pay attention to NotifyGrab
-       * NotifyUngrab, and ignore NotifyWhileGrabbed
-       */
-      if (mode != NotifyWhileGrabbed)
-        toplevel->has_focus = (in) ? TRUE : FALSE;
-      break;
-    case NotifyPointer:
-      /* The X server sends NotifyPointer/NotifyGrab,
-       * but the pointer focus is ignored while a
-       * grab is in effect
-       */
-      if (mode != NotifyGrab &&
-          mode != NotifyUngrab)
-        toplevel->has_pointer_focus = (in) ? TRUE :FALSE;
-      break;
-    case NotifyInferior:
-    case NotifyPointerRoot:
-    case NotifyDetailNone:
-      break;
-    }
-
-  if (HAS_FOCUS (toplevel) != had_focus)
-    generate_focus_event (window, device, source_device, (in) ? TRUE : FALSE);
-}
-
 static gdouble *
 translate_axes (GdkDevice       *device,
                 gdouble          x,
@@ -1312,9 +1227,12 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
         source_device = g_hash_table_lookup (device_manager->id_table,
                                              GUINT_TO_POINTER (xev->sourceid));
 
-        handle_focus_change (window, device, source_device,
-                             xev->detail, xev->mode,
-                             (ev->evtype == XI_FocusIn) ? TRUE : FALSE);
+        _gdk_device_manager_core_handle_focus (window,
+                                               device,
+                                               source_device,
+                                               (ev->evtype == XI_FocusIn) ? TRUE : FALSE,
+                                               xev->detail,
+                                               xev->mode);
 
         return_val = FALSE;
       }

diff --git a/gdk/x11/gdkdevicemanagerprivate-core.h b/gdk/x11/gdkdevicemanagerprivate-core.h
index 5266dfc399a2196e218e52d696e87c7bab87da51..428b34fdd1c56d0c6ae5d2d2f02b69c581b624dc 100644 (file)
--- a/gdk/x11/gdkdevicemanagerprivate-core.h
+++ b/gdk/x11/gdkdevicemanagerprivate-core.h
@@ -37,6 +37,13 @@ struct _GdkX11DeviceManagerCoreClass
   GdkDeviceManagerClass parent_class;
 };
 
+void            _gdk_device_manager_core_handle_focus           (GdkWindow   *window,
+                                                                 GdkDevice   *device,
+                                                                 GdkDevice   *source_device,
+                                                                 gboolean     focus_in,
+                                                                 int          detail,
+                                                                 gboolean     in);
+
 G_END_DECLS
 
 #endif /* __GDK_DEVICE_MANAGER_PRIVATE_CORE_H__ */